auto merge of #246 : alexcrichton/cargo/issue-227, r=wycats
authorbors <bors@rust-lang.org>
Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
committerbors <bors@rust-lang.org>
Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
Test by @EdShaw!

Closes #227

1  2 
src/cargo/ops/cargo_rustc/mod.rs
tests/test_cargo_compile.rs

Simple merge
Simple merge